Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add ability to enable Longhorn V2 Data Engine (backport #55) #57

Merged
merged 5 commits into from
Aug 28, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 28, 2024

This adds longhornConfigs.enableV2DataEngine to the node config CRD. When this value is set to true, we:

  • Add persistent config to /oem/99_settings.yaml to run modprobe and allocate hugepages on system boot
  • Run modprobe and allocate hugepages at runtime, to try to avoid having to reboot the system
  • Restart the kubelet so longhorn is able to verify the allocated hugepages

It's probably easier to review this commit-by-commit, because I added some tests and did some refactoring first, to make sure I wasn't going to break the ntp config persistence.

Related issue: harvester/harvester#5274


This is an automatic backport of pull request #55 done by Mergify.

Copy link
Author

mergify bot commented Aug 28, 2024

Cherry-pick of fb60534 has failed:

On branch mergify/bp/v0.3.x/pr-55
Your branch is ahead of 'origin/v0.3.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit fb60534.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/controller/nodeconfig/config/common.go
	modified:   pkg/controller/nodeconfig/config/config_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/controller/nodeconfig/config/ntp.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Needed for #55

Signed-off-by: Tim Serong <[email protected]>
(cherry picked from commit 0d0cfa2)
Signed-off-by: Tim Serong <[email protected]>
(cherry picked from commit 97d8390)
This allows adding extra stages to oem/99_settings.yaml,
independently of the NTP settings.

Signed-off-by: Tim Serong <[email protected]>
(cherry picked from commit fb60534)

# Conflicts:
#	pkg/controller/nodeconfig/config/ntp.go
Signed-off-by: Tim Serong <[email protected]>
(cherry picked from commit f45269c)
Related issue: harvester/harvester#5274

Signed-off-by: Tim Serong <[email protected]>
(cherry picked from commit 75ec929)
@tserong
Copy link
Contributor

tserong commented Aug 28, 2024

I've manually fixed this so it also pulls in #56, and verified with:

> git cherry -v upstream/master upstream/mergify/bp/v0.3.x/pr-55
- db0249f7fd6191eeb4fb8eaf0eca2854721b8e87 feat: bump go-common
- 2df726ef107da6e2dc8f13aec6f4260515a38002 test: add TestNTPConfigPersistence
- b2b12b3bb6f1a1912eb4ac17d6f8c3e15b37b9a2 refactor: decouple OEM setting persistence ftom NTP
- 1f16191bb23ebd2a4f7ba24c0606655cddae6b57 build: add scripts/generate
- 120ff96875c93ca865e183513db7cd219d922f60 feat: Add ability to enable Longhorn V2 Data Engine

> git cherry -v  upstream/mergify/bp/v0.3.x/pr-55 upstream/master
+ 9f7bc62227000640f342e810ca8b49d8a9fd2663 feat: add renovate.json & mergify.yml
- 30a0bd437d055aef895b923963eabdb2ddf85166 feat: bump go-common
- 97d8390bfb19b014a9b6c65fe9d1e1a6fcf6bf87 test: add TestNTPConfigPersistence
- fb605342392da0987ab2a2faff4fd2b3276dd0c3 refactor: decouple OEM setting persistence ftom NTP
- f45269c527ca852308fa845d78acf2e43b5accd8 build: add scripts/generate
- 75ec9294026e87b1ecbb46e2c4b0455137a6c233 feat: Add ability to enable Longhorn V2 Data Engine

> git diff upstream/mergify/bp/v0.3.x/pr-55 upstream/master
[only shows changes from 9f7bc62227000640f342e810ca8b49d8a9fd2663 feat: add renovate.json & mergify.yml"]

@bk201 bk201 merged commit 3aa76c8 into v0.3.x Aug 28, 2024
4 checks passed
@mergify mergify bot deleted the mergify/bp/v0.3.x/pr-55 branch August 28, 2024 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants